Cleanup of non necessary entrypoints#498

MarcelGeo merged 3 commits intomasterMerginMaps/server:masterfrom

update-limits-for-heade-and-cleanupMerginMaps/server:update-limits-for-heade-and-cleanupCopy head branch name to clipboard