Removed more clutter.

1. Removed unnecessarity function definitions.
2. Removed executing constants file at some places.
3. Introduced constants_old, which also needs to be removed.