More Gotham Changes
Revert "Start Gotham Conversion"

This reverts commit 7b0d79db8d82b8c3fa5fe4a663845ad09ca206de.
Few Gotham Fixes