Remove hardcoded stuff
final touches