Removed unused methods and fixed potential disastrous bug with static